From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 23 Jan 2022 14:08:34 +0000 (+0100)
Subject: Make apropos-print-doc more resilient
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~3272
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a37da91a092c460384bce2ab16341d4e6ec06a9b;p=emacs.git

Make apropos-print-doc more resilient

* lisp/apropos.el (apropos-print-doc): Don't bug out on doc
strings that have invalid command key syntaxes.
---

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 6ff444f8680..f47e70ce5cb 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1276,7 +1276,9 @@ as a heading."
 	(cond ((equal doc "")
 	       (setq doc "(not documented)"))
 	      (do-keys
-	       (setq doc (substitute-command-keys doc))))
+	       (setq doc (or (ignore-errors
+                               (substitute-command-keys doc))
+                             doc))))
 	(insert doc)
 	(if (equal doc "(not documented)")
 	    (put-text-property opoint (point) 'font-lock-face 'shadow))